Merge branch 'master' into scratch
authorRobert Lipe <robertlipe@gpsbabel.org>
Wed, 16 Sep 2015 03:44:18 +0000 (22:44 -0500)
committerRobert Lipe <robertlipe@gpsbabel.org>
Wed, 16 Sep 2015 03:44:18 +0000 (22:44 -0500)
1  2 
nmea.cc

diff --cc nmea.cc
Simple merge